Minor refactoring.
Merge branch 'master' of https://github.com/TheBottleSeller/MapReduceFacility
Formatted strings and shit.