Some Minor Optimisations