Make Constants an enum and code cleaning.