Clearning up a bit