Removed console logs and some comments