Minor refactoring. <Jaideep>