cleaned up the manager part
cleaned up the manager part