Refactored setup.js

Removed debug code
Refactored the update of the highlight and apply it on load