First sequence diagram, more refactoring