beginning some simplification work