renamed a lot of variables