cleaned up, so its now PSR2 checked with phpcs