Removed WhiteRabbit from the global scope and some tweeks