code reformatting

Be sure to check out each individual commit for details.