Cleanup
Refactoring step 2 - scale refact and cleanup
VisualEditor fla changed ))