Some improvements and cleaning in Constants.h