clean up
Merge pull request #3 from zxcvdavid/master

clean up the code