Refactor proposal-options