Took care of handling spaces.