Reordened, applied private/public notation to variables within all classes