Remove async, underscore dependencies and refactor constants.
Fix typo