Minor Updates

Review of code and minor updates, including making variables private
More Minor updates

Cleaned up code, removed unused variables and imports. Also made
variables all private, and set the variables that are never changed to
final. also added some comments on some of the more confusing parts of
the code.