[IAC] Minor refactoring