Slight verbosification and slight refactor