Updated for PSR-2 compliance.

Made the 2 classses PSR-2 compliant and declared properties so that my IDE would stop freaking out.