A ton of simplifying changes