minor cleanup work