Lint

Working towards removing all JSHint errors so that we can check that as a test for future PRs.
Is the return value not where this function is called from?