Some comment and variable name modification