- some little optimisations