Slightly cleanup class declaration generated code