Cleaned up lots of console.logs