Suppress unnecessary warning.
Minor update to log message
Cleaning up the variable names
Whitespace update
Refactoring the generators