Make Common PSR2 compliantO