Order Class :: remove repeated code and extract it to a function.
Merge remote-tracking branch 'origin/master'