issue2573 Fixing line length based on PR feedback