Refactor.
Can't stand red markers shown by JSHint. Cleanup.