Fixed #4566: Fix coding style problems