Resemble refactor