Cleaning up some 'technical debt'