Minor optimisations
Add description