remove some leftover cruft
reindent aligned strings