Code simplifications