Refactor a few modules for better style

Aww shit! I must've accidentally uploaded this when I was rearranging my files!