some cleanup
Merge pull request #15 from scopatz/rema

some cleanup - thanks!