Code cleanup
Merge pull request #12 from wilsonge/patch-4

Code cleanup