Make PSR-2 compatible + minor changes