More controller cleanup and tidying