minor renaming and commenting issues