better
refactored, improving navigability and organization