Bland Refactor.