Minor fixes from the static code check, switched to closure for minification