some clearning up