minor refactoring
Wysiwyg plugin minor review