Slight refactor.