refactor options objectification