controller, polish, cleanup