Refactor new line