CMS-3944 : Wizard is not Serializable - Minor code improvements and refactorings.