# refactored entire solution (cleaned references)