refactor cuepoints slightly