Enhance bareme and waterfall to ease readability.