Various code style fixes