remove unused lines and format codes
Merge pull request #30 from hojs/master

remove unused lines and format codes