Minor clenaup.
Minor cleanup