Reorganized to move all helper methods to utility.h. Fixed problem of nested variables in csp expression by replacing () with {}