Make a cleaner interface