Code simplifications
