- cleaning up some interface stuff