Reduce framework code by 2.5%