Sizing and some cleanup