Working on refactoring question