refactored answers