minor refactoring
minor refactoring
refactoring treasury
improving ordering system