Cleanup HunterEntity a little