cleaned up names of variables