Mayor commit: Started to make the class PSR-2 compliant