Shaved the Yak to provide a cleaner interface