Refactor. Removed console.log