Akshay: Minor refoactorings