Cleanup and update specs