Moved all code to PSR-2 formatting