Cleanup of auto-gen code and comments