Improved line manipulation and improved code style.
Improved line manipulation and improved code style.

severin31/suplemon,twolfson/suplemon,richrd/suplemon,richrd/suplemon,twolfson/suplemon,trylle/suplemon