Add a little conformity, cleanup some code

Mostly cosmetic