refactor long lines