Some Clean up