cleaning up according to diego's email