Cheanup
Preceding
Smaller traits
Merge pull request #2 from lloydmeta/cleanup

Cheanup