Remove useless empty lines
Simplify verbose return
Add empty lines where it makes sense