Renamed some variables, classes, and added some args to a few methods.