Removed console logs, spaced out some lines, removed unused arguments
Added todos