Fixing replace
Cleaning console logs