Simplify end of line handling