clean-up and solve the case sensitive issue