More code style improvements.