Minor refactoring to make everything PSR-2 compliant.