Refactor a few modules for better style

Word. Good to know.