Variable & method naming changes.  Minor code clean up.