Refactor: Respect PSR-0, PSR-1, PSR-2 coding standards