Minor refactoring.
Committing for the sake of committing :/