minor cleanup of who