Fix CS based on PSR-2