minor refactoring before leaving ATIS