More DisplayObject refactoring