cleaning up code to pass `grunt validate`