Code Changes to be PSR-1 Standard