significant cleanup + example