Updated variable names, descriptions