refactored some answers