refactoring
new constructors for Option
delete static import