Some refactoring
add some messages