Optimizing: Code simplification