fixed jshint warnings, comments&refactoring to fillWizard