Making comments consistent.
Converted _set to waterfall method. Needs to be tested.