A little cleanup of max-height and max-width