fixed message
refactoring