Start refacoring and clean up.