refactor for threading

no underscores in names (use camelCase).