Code style

some code cleanup for things I noticed in my own code