A lot of code style fixes.