Breaking out some functionality
Code reorganization
Minor nothings!
Merge branch 'master' of https://github.com/DonatoB/tofu