Improve readability by reformatting long lines