general cleanup of variables to fix typos and consistently use underscore for naming