cleaning up the interface some