Adding formatting step
Updating indexes