Cleaned up class based on PSR-2 via CodeSniffer.