Conforming to psr2 and a few misses in previous refactor