removing comments
more clean-up changes
clean-up
Merge pull request #35 from eewang/clean_up_stuff

Clean up stuff