Updated to strip commas