some suggested changes to improve consistency
Merge pull request #1 from tansaku/master

some suggested changes to improve consistency