refactor last name