some indentin', reformattin' and optimizin'