Refactor New Line