Refactored away strings in code and replaced with enum and constants