Tidying serve definitions