clean-up codes.
Merge pull request #12 from kawabata/master

clean-up codes.