More clarification/simplification