#DDC-1590: Fix Inheritance in Code-Generation: Code Style Fixes