PR review changes; not using Google Closure Compiler syntax