complete the refactor for the organization method.