a bit of file cleanup
code cleanup
Merge pull request #52 from lizlongnc/dev_liz

a bit of file cleanup