apply review comments. refs b5c5a11
apply review comments. refs b0c48e4
Merge branch '2.1' of github.com:garbagetown/playdocja into 2.1