Come to think of it, I'm sure there are other optimisations you could do as well.