Fix variables, remove console.logs