Fix case in constant value, remove redundancies