[Proj IAC] Code refactoring