Small code simplification