Remove scoping to focus on other issues
Finally fix type declarations woooooooo