Fix some style and naming issues from code-review.