apply review comments. refs #920 #1052
Merge pull request #1089 from playframework-ja/issues_920

apply review comments. refs #920 #1052