minor cleanup of Mike code