Deep refactor with small impact