more unicode consistency and removing extraneous spaces