Simplify the code around the renumbering of the services