Removed as many uses of strings as possible