neatening up and some suggestions
Merge pull request #1 from tansaku/master

neatening up and some suggestions