Apply some best practices