Merge: compiler: Refactor