Updated code to match PSR-2

Updated the code to match to PSR-2 standard