Refactorings: String constats were replaced with enums