Tidying up restlet a bit