Some refactoring/clean up
Finish refactoring
Remove the classes and call directly
Explicit on types
Bring back scrooge
Fix bugs
Updates
Merge pull request #186 from twitter/ianoc/refactorMacros

Ianoc/refactor macros
Merge with develop, add tests