refactorings as per discussion on the mailing list