More line formatting fixes