cleanup, better adjacency