Some housekeeping on functions
Deal with spaces after labels (thanks autocorrect)