Making some code more PSR-2 complient