Added some best practices