Some code style changes