Cleaner code in EKGraph