Removed some superfluous log statements
Fixed a small bug