Further fixed formatting