Refactor following Dropwizard manual recommendations