Some formatting fixes (Again)