Fixed formatting and reduced timeout