Some little cosmetic changes to code