Initial work on PSR2 compliance for issue #18