Accesibility modifiers. Some minor changes.