Adding some names, adding comments and moving things around a bit