Minor changes/optimisations