refactoring some postponed methods