Slight refactor / rename