Increasing privacy of some methods + making classes final