refactoring: simlyfied replacement methods