Revise and cleanup rendering.