Code cleanup usage of enums instead of String constants