refactor regex to eliminate extra zeros