Improve download and extract failure logic
Improve cosmetics