Refactor a few modules for better style

Cool. Makes sense.