refactored+test