Fix style nits from PR