Trim spaces when convert string to numeric
Add missed returns