Refactoring for primer story