Removed "/editor", refactor, optimization.