A lot of formatting fixes