psr2 tidy up.
more psr2 tidy up.