tabs to spaces, alignments, etc tidy-up