Merge pull request #31 from thoughtworks/class_cleanup

Class cleanup
Merge branch 'master' of github.com:thoughtworks/pacto into issue26