fixing whitespace and commenting on some suspicious code