Refactoring

Refactoring on methods privacies.