Update formatting in anticipation of switching everything to using prototype
Switch already finished stubs to using prototype