clearning up code