refactored lambda statements in models/option