Rewriting to avoid new line