Code review from Luke - efficiency++

Thank you @lucas42