Issue #149: refactored Editor a bit, removed / reduced visibility of some methods