Cleaning up EditorTopComponent code