added class diagram and removed comments