Cleanup commented code
Add comment for generated code