Removed unnecessary logging

And added some comments