Style fixes according to PR comments