some public interface cleanup