[cs] cleanup master

Fix PSR-0 and PSR-2 issues.