applying some best practices