minor refactorings
Merge pull request #51 from ICTKyouikukei2013/tos-kamiya/clean

minor refactorings