Removed TODO
Tiny optimisation