Some refactoring of HttpStatus