FIXING ALL PROJECT TO PSR2 RULES