Tried to simplify