cleaning up, preparing for UML