Fixed some of the PSR2 issues