Code cleanup + IDisplay resolving fix