Clean constants and variable types