fixed issue with options initialization
another DRY refactoring