Refactor. Ensure new lines.