[Proj IAC] Some more code refactoring