Small changes that make more sense