Cleaning up, moving vars to privates and renaming them. Commenting up.