Work on jersey server-side implementation
Tidy-ups