re-formatted some more