Be more consistent and make more sense.