Formatting refactor, adding ConnectTime