Sort out some of the issues with tabs and non-left alignments