cleanup and add some more specs