Second refactoring post