Can someone more familiar with simplification please review the changes in this file?