refactored log messages
clean;