made stuff more functional