Tweaked a few best practices and updated linter