Added a constructor and made the fields package-private