Minor refactoring. Extracted a few methods on Proposal