Code cleanup to resolve grunt errors

Code cleanup to resolve grunt errors