some whitespace cleaning and upgrade fixing