Format existing scenarios

Next changes will committed in branches