Fix and Cleanup