cleaning + simplifying methods
cleaning + simplifying methods