Fix inconsistencies in terms of new lines, et al