clean up
Merge pull request #12 from cboss24/code_clean_up

clean up