Updated and Cleanup