Small refactoring
Merge origin/master