Clean up Controller to Ctrl
build