Starting to decouple god class