Minor cleanup and standardize window size.