clean up. change guido -> app