Let's make this leaner