Missed some style comments from code reviews earlier today, trying to clean up