(minor cleanup work)