Cleaning up the interface