clean up code
Merge pull request #13 from go-lab/cleanup

clean up code