Changed deleted all the 'curr_' prefixes for better readability.