Ratios and some cleanup