Refactoring to lines of length <= 80