I mixed up two separate improvements into one, this change aims to clarify them based on a suggestion and conversation with @T-X.
