Clean up interfaces a little bit