added more cleanup and specs