Refactored more responsibility into the master