Merge branch `rewrite` into `master`.
Fix variable names.
Merge branch `cleanup` into `master`.
Comment 'generateProposalID'.