Minor changes including removal of console.log