apply review comments. refs #923 and #1052
Merge pull request #1092 from playframework-ja/issues_923

apply review comments. refs #923 and #1052