Add minor improvements
Remove console.log
Fix default value