cleanup + comments
class diagramm