Slightly simplify