Reformat code to standardise indenting and improve readability
Remove tipuesearch_set as this is captured in conf.py