Small refactor
Merge origin/master