Fix information order in download progress message; Some code cleanup