Minor cleanup changes