Begin fixing linting errors
Fix remaining linting errors