Tiny code cleanups

Gotta do my best to keep it neat