Yes, and consolidate the duplicated code.