Updated the names of the variables and some alignments