renamed several variables