Minor refactoring of swagger