Refactor: Kill the loop