Update

Fix and Cleanup