Updated private variables.
Reorganized code.