formatting clean up lines 26 - 29