Refactor proposals