Cleanup: makes fields final, reduces visibility of classes.