Some code style changes...