ESP cleanup

Changed variables to the proper name and changed a little spacing.