removed log and improved log messages