Merge pull request #27 from echen027/master

cleaning up code