just refactored