Clean up and adding controller.