Refactor 4/N