refactoring code to avoid line wrapping
Merge branch 'hotfix-correct_line_length'