Changed variable names to more "usable" names