Minor refactore in ais