Cleaning some whitespaces