Tidied up Jetty server for new setup