Refactored and targeted for Jetty