update comments and name spacing