Extracted away more objects. Case changes