removed/renamed variables