more changes to standardize

more changes to standardize