Removed the log messages
Improved the comments