Refactor long lines