remove trailing spaces
fix alingment of concatenated strings