Neaten up line order