reorganizing, renaming, and commenting