More code style changes