added Alexis Bottero's axisymmetric formulation; also removed useless wh...

...ite spaces