dramatically cleaned up code
Merge pull request #6 from projectzen/tooling_around

dramatically cleaned up code