[REF] Minor simplification on input