More style changes
Changes the way to set timeouts