comments, comment out old code
trivial name changes