[m] clearer code