Code clearning up