Just tidying controller