Fix up the is code a bit
Removed console logs