Bit of clean up

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>
PSR-2 tidy up

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>