made most changes, eliminated white space