removed white space handling completly