Clean up the interface a bit