added simplification for constants, next up, variables