[IAC] Some more refactoring. Is this the end?