Fix code style issues from 42512d9c9c8df9d1fbb8062c7b5459d47b49373d