Issue 8660 by cableman: Ensured that coding style and comments