Re-ordering generation
Removing newline