Manual code style changes
Some auto code style updates