cleaning + simplifying methods