Update comments and variable names