mostly formatting

and remove ClearAlls as usage messages where not showing up.