Add visibility modifiers
Reformat code