Draft: Small interface cleanup