some quick optimisations