Temp
Minor cleanup changes.