Minor cleanup changes and merge test
Minor cleanup changes and merge test