Minor simplification