Slight refactor...