changed camelCase vars to underscores