Removed unnecessary reference.
Refactor constants