Refactoring before changing the public interface