Cleaning up and also made all internal parts of yama private.