Make small improvements to code organization