Made the code PSR-2 compliant