Refactor yes to make it more clear/efficient