Change privacy of methods
Some refactoring