spaghetti refactor
refactored