Made private fields of classes actually private, removed unused fields.