Tidy up the connection strings