Code cleanup to resolve grunt errors
Merge pull request #1 from Valid/wts-develop

Code cleanup to resolve grunt errors