Code cleanup
Fixed an annotation
Fixed a return type
Merge pull request #370 from thephpleague/cleanup

Code Cleanup