Some optimisations...