fix all the formatting