Updated and Cleaned Files