Remove newlines.
Cleaup, refactor.
Merge.