Refactor

I got bored over the weekend, so I made things "better".