Line length cleanup