Attempt to solve Bug #2795. review @dinhviethoa

review @dinhviethoa 
We (almost?) never use 2 blank lines to separate anything.