a few indentation and white space corrections