Remove whitespace from user text

Also, rework makeTable() to remove the Delegate class.