Remove console logs and add comments