Cleanup
IE support and code formatting