Refactor long line