Refactor more rushed code

and add the word 'Hive' so people know it's using the game's skill and
not some obscure measure of it.