Applied some best practices.