Cleanup to adhere to jslint