Cleanup code to conform to coding standards PSR-2.