Some tweaks related to best practices
Merge branch 'best-practices'