Add refiners to each parser
Eng string to number
Update the test
Re-indent code