Add comments & remove console.logs