Minor refactoring around master soup code
Simplify master soup code