Make hba rules cleaner