tidying up a bunch of stuff to make the service dev clearer now.