Put code simplification back

Not essential