removed the console.logs and some commented out code