Minor cleanup from PR feedback