Clean some code and add some stl