lean and clean
merge #18 lean and clean (sstok)

This PR was squashed before being merged into the master branch (closes #18).

Discussion
----------

|Q            |A  |
|---          |---|
|Bug Fix?     |n  |
|New Feature? |n  |
|BC Breaks?   |n  |
|Deprecations?|n  |
|Tests Pass?  |n  |
|Fixed Tickets|   |
|License      |MIT|
|Doc PR       |   |

Commits
-------

e5334bf5e1ed7475a4f958d22bf4d0b012f5025d lean and clean