Some code style updates