Refs #106 - Fix PSR-2 issues.