Code clearning up for the  demo