Fixing some code standards

Following PSR-1/2