Some comments, removed some console.logs