Less do-notation

slowly removing do-notation from Core
more "cleaning" of Core
Merge pull request #8 from joeschmo/joebot-persistent

Cleaning Core