Slight minor refactor