Interface cleaning

whoops this should have been committed like 3 times