Got rid of console.log()s and improved formatting