Cleanest version yet.