Working on simplification and abstraction