MInor coding style fixes