refactorings in ebaylms