Style cleanup; more functional style.
Merge branch 'master' of https://github.com/YaLTeR/ForestryFix