ByHosts cleanup

Just some standardisation