- question refactor