Time: <1s - slight refactor