Continue to refactor
no message