Removed debugging log statements, added some comments