Improve best practices