missed this earlier: finish refactor; remove reference to spaces functio...

...n