#7 - Convert code to PSR-2 standards

Convert code formatting to PSR-2 standards as best I can.