Clean up map
Standardize windows.