Better naming of variables