Minor refactoring which will ease in merger