Simplify changes per review