PSR2 refactor
CS