Just a few cleanups

Meh, just some cleanups.