Update of Project according to PSR 2 rules