Refactoring

Just cleaning things up a little bit