basic cleaning
Merge pull request #12 from Runnable/cleanup

basic cleaning