Refactoring controls and renderers.