clean-up and remove spaces