Refactoring in EntityRefs, find params, and in general in game