Cleanup whitespace
Upgrade jetty version