Clean up render() methods