Extract some more methods...