Some code cleanups
Goes over some things I found when reading the code for shortcuts release.
I'd recommend reviewing this by commits, it will make it easier to make sense of it.
Goes over some things I found when reading the code for shortcuts release.
I'd recommend reviewing this by commits, it will make it easier to make sense of it.