Fixed some formatting things; removed console.logs; ready to submit