Values replaced with enumerations and cleaned up a bit