Code cleanup to resolve grunt issues