More code style cleanup