replaced integer constants for remainder type with enum