Moved on end commands to methods
Change ckeditor dependencies