Tidy up some interface