Some optimisations

....