cleanup and more spoj