More code style improvements