Small refactoring
Master enhancements