replaced some remaining spaces