I1: Code refactor