CS and docblock fixes
Tweaked the constructors
Merge pull request #9 from GrahamCampbell/cleanup

CS and docblock fixes