improve and fix some whitespace errors