some code style fixes according to google code style