getting cleaned up before i get dirty later in Models