clean up source + introducing superators