Initial work on adapting code to PSR-2 standards