cleaning up interfaces a bit