Minor cleanup to dict class