Applied some best practices fixes