AID-260 Minor refactor.