first round of formatting fixes