Cleanup to pass jslint