post-refactor cleanup
Merge pull request #4 from mpath/working

post-refactor cleanup