cleanup and specs