code style fixes according to google guidelines