#27 made a few additional fields and methods private