Clean up and work towards HTML5