Much Refactor! Using phpcs and phpcfb to bring the code up to PSR2 standards