General update. All code is now PSR2 compliant