cleanup (mostly removing traling whitespace)