1. Fix any existing inconsistencies 2. Write tests and integrate into UT suite so that consistency is preserved