proposals refactoring