Cleaned up simulator markup