Clean up the public interface a little