Removed logging statements and added comments