First round of code style updates