Fix loads of formatting