Refactor Line