some refactoring, abtestcluster assignment seems to work
minor changes