Refactor RefreshService, ProceedToOrder
Merge origin/master