Raman - Refactor code for different browsers