reduced some classes from public to default visibility