Implement Matt's tidier suggestion