Updated the logs and made a small tweak to get rid of unneccesary function calls