Clean up code with first test of bootstrap and dojo implemented