pruning and simplifying the code (get rid of notation like @[ev;x])