Cleanup
Refactored to be more flexible
Cleanup some terminology
Merge pull request #376 from thephpleague/cleanup

Cleanup