Cleaning some stuff up a bit to share with Prabhas