correct use case diagramm and code clean up