Update comments, clean up unnecessary codes, correct download files to reflect correct names