Code cleanup, no functional change.  Add contains method to avoid iterating through the set/list within the Engine