I would enjoy seeing this as a separate commit, since it's just noise