Some 80 col clean up