Removed erroneous hard coded values in data variables