refactor proposal code
fixup "refactor proposal code"
Merge pull request #732 from xi/feature-refactor-proposal

refactor proposal code