Cleanup definitions
Merge pull request #208 from GrahamCampbell/cleanup

Cleanup Definitions