update comments and whitespace