Minor cleanup and removal of some unneeded console.log commands.