Render partial clean-up and code mutualisation