Remove console logs, add comments