Fixed line break
More goog.scope and fix long lines