Some refactoring
Merge branch 'master' of https://github.com/wwagner4/shuck.git