Code refactor proposal