questions refactoring