Fixed CS to abide by PSR0, PSR1 and PSR2