Beginning in place, clean
Beginning breakup to facilitate unit testing