cleanup some whitespaces