Refactor after CR