hacky fix for ST3
Clean up existing linter errors