Entity tools polish - round 2

Not sure what the preference on style here is.  I can switch this to a while loop if that is preferred when there is nothing to initialize.