some white space issues fixed