fix first message
refactoring