Akshay/Pooja: Minor refactorings