retouching the naming of variables and stuff...