Verify and fix encapsulation

[MichaelAceAnderson]

Apply correct encapsulation to all methods and attributes to make sure nothing is exposed for no reason and nothing is inaccessible where it should be