A little tidying up of server side components