Some small refactoring on MainMaster