very small Refactor
Merge remote-tracking branch 'origin'