Code Formatting

Also timeout removal