round of micro optimisations