added comment, remove console.log etc