Tidy formatting in basicstubs