clean up
Merge pull request #3 from dawnwastaken/dev

clean up