Made whitespace splitting smarter