slight refactor + comment change