Added Cleanup and Init