Added 5-second timeout for launcher update requests.
Minor code cleanup