Minor tweaks
Merge branch 'best-practices'