cleaning up pass 1
Merge pull request #5 from jaepanda/cleanup

cleaning up pass 1