Partially changing coding styles to Closure library style.